Merge branch 'master', remote-tracking branch 'upstream/master'
chutiyapa removed
Merge pull request #7 from AnishShah/master

Clean up