Updated code reflecting changes raised by @CanIbanoglu
Merge pull request #1 from leifos/master

Updated code reflecting changes raised by @CanIbanoglu