Merge pull request #59 from mreist/master

Jay
Wheel layers are now correct
Merge pull request #61 from mreist/Jay

Jay