moved things here and there
Merge pull request #19 from khan4019/master

moved things here and there