revmoing hardcoded stuff
Merge pull request #37 from liouh/master

removing hardcoded stuff