Fixes, additions and code insertations.
Merge pull request #1 from HackSpark/master

Fixes, additions and code insertations.