resolved #1 and fixed #4 Bumped to latest SM build