[axof: 124][axof: 125]
Merge pull request #7 from hillbilly90/newestSamDev

[axof: 124][axof: 125]