progress on multiple issues
Merge pull request #13 from elricgit/master

Eric's changes