Fixed issues:
#2
#11