Merge pull request #23 from narusemotoki/develop

hot realoading of controller and bug fix