Merge pull request #5 from diekmann/dev-unstable

Dev unstable - insabelle 2014