Merge pull request #9 from shawntabai/master

Merge from master
Merge pull request #10 from shawntabai/shawn

Merge pull request #9 from shawntabai/master