Edited for 1-bugfix on GitHub