#7 Support for IDEA 13