merged
added release 1.0 info