GitHub #106 and #111 for Assembly #250

@austinylin
Merge pull request #117 from lachlanjc/patch-11

GitHub #106 and #111 for Assembly #250