Merge pull request #21 from rzcoder/dev

Merging with dev
fix constructor