Merge pull request #1 from 625alex/master

Pulled updates from Alex