Merge pull request #2 from buchmoyerm/master

Added missing files (got them from the original fork)
Improved Error Handling (+1 squashed commits)

Squashed commits:

[0623c90] Bug fixes on close