Fixes #3 - Added extra stuff