fixed some things
Merge pull request #25 from KennethAS/devfix

fixed some things