Merge pull request #7 from bhakimi/master

pull in changes that were added
Merge pull request #8 from bhakimi/master

pull changes
Merge pull request #6 from drewbeer/master

merged from customer.