Merge pull request #10 from bhakimi/master

pull from customer
Merge pull request #11 from bhakimi/master

merge.
Merge pull request #10 from drewbeer/master

merge minor changes.