Current work
comiting
Merge pull request #129 from extremezoo/Everett's-branch(6/5/14)

Everett's branch(6/5/14)