25.09.2015 - Added some new features