Merge pull request #9 from imranashraf/master

merge develop
works after rearranging dirs
working with pin 2.13
small modifications, cleanup, structuring
after merging with pin2.13 version