Merge pull request #1 from paddatrapper/master

Fixed bugs, added useability