Import - Redo
Merge pull request #111 from Fitz3012/master

Import v1.1