Develop

http://particular.myjetbrains.com/youtrack/issue/INSTL-28

http://particular.myjetbrains.com/youtrack/issue/INSTL-13#