Andolamin Merge pull request #45 from psarin/master