Added support for issues #11