Merge pull request #96 from catmadevel/f49

F49
cleanup
Merge pull request #11 from mpetris/f49

F49