partial fix #15
completed fix #15
cs fixes
Merge pull request #16 from superdweebie/master

fix #15