Development

Fix and close #3
Fix and close #4
Fix and close #14