Merge pull request #9 from zongordon/master

Merge Stable with Master