Merge pull request #5 from Benabik/master

Miscellaneous Improvements