get rid of hard coded parameters
Merge pull request #93 from Pathologic/master

get rid of hard coded parameters