Closes issues #1