final commit 112014
Merge pull request #5 from ScottJr/111814a

final 112014