Fixed minor issues brought up in meeting.
Code review comments.
fixed sample.
Merge pull request #33 from jivid/minor_updates

Fixed minor issues brought up in meeting.