Develop

Merge #14, #17, #18, #25, #27