try to avoid conflicts:)
Merge pull request #15 from zmathe/dev_dirac1

try to avoid conflicts:)