closes #14
closes #11 and #13
closes #12
added empty lines
Merge pull request #15 from HardieBoeve/bug-fixes

Bug fixes