Fixed #24 in Dev Branch