Fixed a few issues which exposed in exercises.
Merge pull request #87 from snakevil/master

Fixed a few issues which exposed in exercises.