moved shit into new file
Merge pull request #79 from psaintlaurent/master

moved shit into new file