Merging again because I was merging in detached state

Samo Penic

2016-12-06 c2c6364dc7d23f21dabd2179e775e93ba4eeb252

1
Original written by Dan Kroll in FORTRAN. Code was then largely adapted and commented by Miha Fosnaric-Fosni. Rewritten into C by Samo Penic-Peni, with help of Miha's extensive explanations.