Merge pull request #2 from marstonstudio/master

sync latest changes