Merge pull request #35 from MisterJames/master

branch sync