Issues #14, #15, #13, and partly #7 are fixed
Merge pull request #25 from dcerge/master

Issues #14, #15, #13, and partly #7 are fixed