Merging master and development branch #12

Closed tokami closed 8 years ago