Merge pull request #9 from shawntabai/master

Merge from master