AKEric/maya — pull request #1 by AKEric (2014-12-24 23:45:22+00:00)
Title: Wip changes

merging back to master