Added changes from checkin
Merge pull request #3 from mangolemons/checkin

 Added changes from checkin