re fork of Markush2010's repository because of Github Bug