Merge pull request #57 from jonadem/master