Resolves issues:
#3
#4