merging marge
Merge pull request #5 from ChronicD/post_merge

fixed bugs as a result of previous merge.