Fixed some issues
Merge pull request #14 from antbanks2014/master

Fixed some issues