Closes #46 and #47 of official issue list