#4 and #5 Issues done.
Merge pull request #11 from jaeyz/Issues_#4_and_#5

#4 and #5 Issues done.