Merge pull request #15 from woolong/master

PR - Issues #9 #14
Merge branch 'jorgepgjr-master'