Big check in with bug fix
Merge pull request #12 from kmanalo/master

Big check in with bug fix