clean-up changed
Merge pull request #141 from georgebyelas/master

clean-up changed