Added missing semi-colons, fixed tests, and refactored code
Merge branch 'development' of github.com:jonathanporras/spctrl into development