more updates
Merge pull request #2 from mbuff24/feature/092014_updates

more updates