Merge pull request #31 from avsej/master